From 1c143ba820d281a95409b1295ec75136d92a71a8 Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild2.aw" Date: Tue, 6 Feb 2007 15:20:26 -0700 Subject: [PATCH] [IA64] Don't assume legacy com2 If com1 isn't at a legacy I/O port address, don't assume legacy com2 exists. Signed-off-by: Alex Williamson --- xen/arch/ia64/xen/xensetup.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/xen/arch/ia64/xen/xensetup.c b/xen/arch/ia64/xen/xensetup.c index 37de379e2a..8909136b26 100644 --- a/xen/arch/ia64/xen/xensetup.c +++ b/xen/arch/ia64/xen/xensetup.c @@ -267,13 +267,16 @@ void start_kernel(void) early_setup_arch(&cmdline); /* We initialise the serial devices very early so we can get debugging. */ - if (running_on_sim) hpsim_serial_init(); + if (running_on_sim) + hpsim_serial_init(); else { - ns16550_init(0, &ns16550_com1); - /* Also init com2 for Tiger4. */ - ns16550_com2.io_base = 0x2f8; - ns16550_com2.irq = 3; - ns16550_init(1, &ns16550_com2); + ns16550_init(0, &ns16550_com1); + if (ns16550_com1.io_base == 0x3f8) { + /* Also init com2 for Tiger4. */ + ns16550_com2.io_base = 0x2f8; + ns16550_com2.irq = 3; + ns16550_init(1, &ns16550_com2); + } } serial_init_preirq(); -- 2.30.2